Skip to content

[8.x](backport #7456) Support replace directives in otel readme mage command#7616

Merged
swiatekm merged 1 commit into8.xfrom
mergify/bp/8.x/pr-7456
Mar 28, 2025
Merged

[8.x](backport #7456) Support replace directives in otel readme mage command#7616
swiatekm merged 1 commit into8.xfrom
mergify/bp/8.x/pr-7456

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 28, 2025

What does this PR do?

Makes the otel:readme mage command support replace directives. It now also supports pseudo-versions that Go uses for commit hashes in go.mod.

The implementation now actually parses the go.mod file using x/mod.

Why is it important?

In order to resolve a dependency conflict between beats and otel 0.120.x, we're going to use our own fork of prometheusreceiver. See #7443 for this change made in the 8.18 branch.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas

This is an automatic backport of pull request #7456 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from a team as a code owner March 28, 2025 12:46
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 28, 2025
@mergify mergify bot requested review from michel-laterman and ycombinator and removed request for a team March 28, 2025 12:46
@mergify
Copy link
Contributor Author

mergify bot commented Mar 28, 2025

Cherry-pick of 9071254 has failed:

On branch mergify/bp/8.x/pr-7456
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 907125402.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE.txt
	new file:   dev-tools/mage/otel/deps.go
	new file:   dev-tools/mage/otel/deps_test.go
	modified:   magefile.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog chore Tasks that just need to be done, they are neither bug, nor enhancements labels Mar 28, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

* Support pseudo-versions in otel readme mage command

* Move otel dependency handling to a separate package

(cherry picked from commit 9071254)

# Conflicts:
#	go.mod
@swiatekm swiatekm force-pushed the mergify/bp/8.x/pr-7456 branch from 5afe15c to 4a77955 Compare March 28, 2025 14:14
@swiatekm swiatekm enabled auto-merge (squash) March 28, 2025 14:15
@elastic-sonarqube
Copy link

@swiatekm swiatekm merged commit 47588b7 into 8.x Mar 28, 2025
12 checks passed
@swiatekm swiatekm deleted the mergify/bp/8.x/pr-7456 branch March 28, 2025 15:58
@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @swiatekm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport chore Tasks that just need to be done, they are neither bug, nor enhancements conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants